Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 01:10:26 +0000 (17:10 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 01:10:26 +0000 (17:10 -0800)
commit9e4ff08794742161a0c28fcf2558197aec9eccab
treec46857ea3973b8fbc7fea46ef6086318faa0810d
parentb13ce0d9f1ff3886357aec7f8d03ca6878dbdaf6
parent24b427d4460371909090f34a4a71d0dd7fed3137
Merge from trunk.